From bb8b459407a834765efd27cffd4aa448b0c45c8a Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Tue, 26 Apr 2016 09:57:36 -0300
Subject: [PATCH] placesview: follow up fixes

This patch unmarks the addresses' prefixes as translatable,
and updates the callback name to reflect what it really does
now.

This is a follow up fix from commit 7449add82.

https://bugzilla.gnome.org/show_bug.cgi?id=756570
---
 gtk/gtkplacesview.c     |  8 ++++----
 gtk/ui/gtkplacesview.ui | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
index 79d2e21944..81a5dde452 100644
--- a/gtk/gtkplacesview.c
+++ b/gtk/gtkplacesview.c
@@ -1829,10 +1829,10 @@ out:
 }
 
 static void
-on_address_entry_clear_pressed (GtkPlacesView        *view,
-                                GtkEntryIconPosition  icon_pos,
-                                GdkEvent             *event,
-                                GtkEntry             *entry)
+on_address_entry_show_help_pressed (GtkPlacesView        *view,
+                                    GtkEntryIconPosition  icon_pos,
+                                    GdkEvent             *event,
+                                    GtkEntry             *entry)
 {
   GtkPlacesViewPrivate *priv;
   GdkRectangle rect;
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index c31a335d86..09911baa24 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -178,7 +178,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
               <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">afp://</property>
+                <property name="label">afp://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -190,7 +190,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
               <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">ftp://</property>
+                <property name="label">ftp://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -202,7 +202,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
               <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">smb://</property>
+                <property name="label">smb://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -214,7 +214,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
               <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">sftp://</property>
+                <property name="label">sftp://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -226,7 +226,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
               <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">ssh://</property>
+                <property name="label">ssh://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -238,7 +238,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
               <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">http:// or https://</property>
+                <property name="label" translatable="yes" comments="Translators: do not translate http:// and https://">http:// or https://</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -490,7 +490,7 @@ smb://foo.example.com, ssh://192.168.0.1</property>
                 <property name="completion">address_entry_completion</property>
                 <signal name="notify::text" handler="on_address_entry_text_changed" object="GtkPlacesView" swapped="yes"/>
                 <signal name="activate" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes"/>
-                <signal name="icon-press" handler="on_address_entry_clear_pressed" object="GtkPlacesView" swapped="yes"/>
+                <signal name="icon-press" handler="on_address_entry_show_help_pressed" object="GtkPlacesView" swapped="yes"/>
               </object>
             </child>
             <child>
-- 
2.30.2